Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: save_trimmed_fail is a boolean #125

Merged
merged 6 commits into from
Apr 22, 2024
Merged

Fix: save_trimmed_fail is a boolean #125

merged 6 commits into from
Apr 22, 2024

Conversation

adamrtalbot
Copy link
Contributor

save_trimmed_fail had conflicting settings for boolean and enum of two strings. This removes the enum option.

PR checklist

  • This comment contains a description of changes (with reason).
  • If you've fixed a bug or added code that should be tested, add tests!
  • If you've added a new tool - have you followed the pipeline conventions in the contribution docs
  • If necessary, also make a PR on the nf-core/bacass branch on the nf-core/test-datasets repository.
  • Make sure your code lints (nf-core lint).
  • Check for unexpected warnings in debug mode (nextflow run . -profile debug,test,docker --outdir <OUTDIR>).
  • Usage Documentation in docs/usage.md is updated.
  • Output Documentation in docs/output.md is updated.
  • CHANGELOG.md is updated.
  • README.md is updated (including new tool citations and authors/contributors).

d4straub and others added 4 commits August 27, 2021 14:16
@d4straub
Merge pull request #59 from nf-core/dev
9599673 
Prepare release 2.0.0
@mashehu
Merge pull request #97 from nf-core/dev
e94a173
@Daniel-VM
Merge pull request #122 from nf-core/dev
9f368d4 
Release 2.2.0
@adamrtalbot
Fix: save_trimmed_fail is a boolean
9334814 
save_trimmed_fail had conflicting settings for boolean and enum of two strings. This removes the enum option.
@github-actions GitHub Actions
Copy link

This PR is against the master branch ❌

  • Do not close this PR
  • Click Edit and change the base to dev
  • This CI test will remain failed until you push a new commit

Hi @adamrtalbot,

It looks like this pull-request is has been made against the nf-core/bacass master branch.
The master branch on nf-core repositories should always contain code from the latest release.
Because of this, PRs to master are only allowed if they come from the nf-core/bacass dev branch.

You do not need to close this PR, you can change the target branch to dev by clicking the "Edit" button at the top of this page.
Note that even after this, the test will continue to show as failing until you push a new commit.

Thanks again for your contribution!

@adamrtalbot adamrtalbot changed the base branch from master to dev April 16, 2024 15:19
@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 16, 2024 •
edited
Loading

nf-core lint overall result: Passed ✅

Posted for pipeline commit ab26e8d

+| ✅ 173 tests passed       |+
#| ❔   4 tests were ignored |#

❔ Tests ignored:

✅ Tests passed:

Run details

  • nf-core/tools version 2.13.1
  • Run at 2024-04-22 11:53:24

@maxulysse
Copy link
Member

CHANGELOG?

Daniel-VM
Daniel-VM approved these changes Apr 17, 2024
View reviewed changes
Copy link
Contributor

@Daniel-VM Daniel-VM left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you. Everything is fine on my side. It seems that a test failed because this PR initially pointed to master (now it's all good).

I still have to bump version 2.3.0dev in CHANGELOG.md (on my way).

@Daniel-VM
Copy link
Contributor

Now the CHANGELOG is updated (see #126). Should I ignore the failed test and proceed with the merge?

@d4straub
Copy link
Collaborator

The CHANGELOG should contain a mention of this PR and the change made here. But its not. So while the new section in CHANGELOG is now available, it requires the addition of an entry in this PR.
In case the tests still fails after the addition to the CHANGELOG, imho you could just merge anyway.

@Daniel-VM
Copy link
Contributor

Sorry for the delay. I have now added this PR to the CHANGELOG for version 2.3.0dev 😅

@Daniel-VM Daniel-VM merged commit 9e0399c into dev Apr 22, 2024
9 checks passed
@Daniel-VM Daniel-VM mentioned this pull request Apr 24, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Daniel-VM Daniel-VM Daniel-VM approved these changes

@maxulysse maxulysse maxulysse approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@adamrtalbot @maxulysse @Daniel-VM @d4straub @mashehu